Merge git://git.denx.de/u-boot-marvell
authorTom Rini <[email protected]>
Thu, 30 Nov 2017 15:38:40 +0000 (10:38 -0500)
committerTom Rini <[email protected]>
Thu, 30 Nov 2017 15:38:40 +0000 (10:38 -0500)

Trivial merge